Add type GUIDs to partitions resolver #2745
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I still need to add tests and make sure that |
jcpunk
reviewed
Aug 6, 2024
lib/facter/resolvers/partitions.rb
Outdated
| return {} if lsblk_version < 2.23 | ||
|
|
||
| # lsblk 2.25 added support for GPT partition type GUIDs | ||
| blkid_and_lsblk[:lsblk] ||= if lsblk_version >= 2.25 |
There was a problem hiding this comment.
Might it be easier to run lsblk with the longer args and rescue if it errors out?
mhashizume
force-pushed
the
gpt-guids
branch
3 times, most recently
from
b2abca0
to
45ee919
Compare
|
Closing and reopening to grab latest tests. |
Ruby 2.4 introduced the compact method to drop nil values from a Hash. Since Facter recommends Ruby 2.5 and above, we are able to replace more lengthy logic with Hash#compact instead.
Prior to this commit, the partitions resolver only used lsblk as a fallback if blkid did not return any information. However, there are many advantages to lsblk. lsblk does not necessarily require root (while blkid does), it returns more information (like partition type GUIDs), and blkid specifically recommends using lsblk in its manpage. This commit updates the partitions resolver to prefer lsblk and use blkid as a fallback.
This commit adds a new fact to the partitions fact hash, partition type GUID. Co-authored-by: Michael Hashizume <[email protected]>
|
I've updated the branch protection rule to no longer require integration tests against JRuby 9.3.90 or 9.4.7.0 (these tests were updated in #2740) |
cthorn42
approved these changes
Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds partition type GUIDs to the partitions resolver.
In order to add this information, this PR also changes the partitions resolver to prefer
lsblkoverblkid. Previously, Facter would useblkidand fall back tolsblkonly ifblkiddid not return anything, for whatever reason. However, there are several reasons to preferlsblk:lsblkcan return more information (like partition type GUIDs) thanblkid.lsblkdoes not have to necessarily run as root,blkiddoes.blkid's man page specifically recommend usinglsblk: